Auto merge of #4180 - pnkfelix:issue-4135, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 21 Jun 2017 12:11:25 +0000 (12:11 +0000)
committerbors <bors@rust-lang.org>
Wed, 21 Jun 2017 12:11:25 +0000 (12:11 +0000)
Issue 4135: include = [...] should override git file list

Fix #4135: if theres `include = [...]`, then do not prepopulate file list via git.


Trivial merge